From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 14 Oct 2013 03:42:59 +0000 (-0400)
Subject: notificationDaemon: Move nextNotificationId inside the daemon class
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3179
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=27a86a4756ed3313582b7f9b0151a7272385989a;p=gnome-shell.git

notificationDaemon: Move nextNotificationId inside the daemon class

This won't be used by the new notification daemon.

https://bugzilla.gnome.org/show_bug.cgi?id=710137
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 3e47dc75d..eecaee9da 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -15,8 +15,6 @@ const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
 const Util = imports.misc.util;
 
-let nextNotificationId = 1;
-
 // Should really be defined in Gio.js
 const BusIface = <interface name="org.freedesktop.DBus">
 <method name="GetConnectionUnixProcessID">
@@ -115,6 +113,8 @@ const NotificationDaemon = new Lang.Class({
         this._notifications = {};
         this._busProxy = new Bus();
 
+        this._nextNotificationId = 1;
+
         this._trayManager = new Shell.TrayManager();
         this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
         this._trayIconRemovedId = this._trayManager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
@@ -252,7 +252,7 @@ const NotificationDaemon = new Lang.Class({
               hints['category'] == 'presence.offline')) {
             // Ignore replacesId since we already sent back a
             // NotificationClosed for that id.
-            id = nextNotificationId++;
+            id = this._nextNotificationId++;
             Mainloop.idle_add(Lang.bind(this,
                                         function () {
                                             this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
@@ -296,7 +296,7 @@ const NotificationDaemon = new Lang.Class({
             ndata.notification = this._notifications[replacesId].notification;
         } else {
             replacesId = 0;
-            ndata.id = id = nextNotificationId++;
+            ndata.id = id = this._nextNotificationId++;
         }
         this._notifications[id] = ndata;